Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Wed, 26 Mar 2008 13:51:04 +0000 (08:51 -0500)
committerRob Browning <rlb@defaultvalue.org>
Wed, 26 Mar 2008 13:51:04 +0000 (08:51 -0500)
commitf00a075139ecfd3480380f703b7ab00cea7c9194
treec6e07dae5cc7c129d01b5702896bb5fa3562d32c
parentb4abb6d07f7b1e0ab358ac099f6d800f183759b1
parentbbed24f026cfa761a9574b7aa8301f192a511e53
Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master